From 54a0093d8214fe2ec194e3f4332336daff7849c3 Mon Sep 17 00:00:00 2001 From: "iap10@tetris.cl.cam.ac.uk" Date: Fri, 17 Jun 2005 22:40:37 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.168 (42b351653L3XVvz6UCiRgtfHHvj-Eg) Subject: [Xen-devel] [PATCH] _perform_err the declaration of _perform_err needs at least three arguments (exlcuding self), but gets onky called with two args at many places. This messes up xend-debug.log. Patch is against 2.0-testing, but applied cleanly to unstable as well, when I checked last. From: Kurt Garloff Signed-off-by: ian@xensource.com --- tools/python/xen/xend/server/SrvBase.py | 3 +-- tools/python/xen/xend/server/SrvConsole.py | 2 +- tools/python/xen/xend/server/SrvConsoleDir.py | 2 +- tools/python/xen/xend/server/SrvDir.py | 2 +- tools/python/xen/xend/server/SrvDmesg.py | 2 +- tools/python/xen/xend/server/SrvDomainDir.py | 2 +- tools/python/xen/xend/server/SrvNode.py | 2 +- tools/python/xen/xend/server/SrvVnetDir.py | 2 +- tools/python/xen/xend/server/SrvXendLog.py | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/python/xen/xend/server/SrvBase.py b/tools/python/xen/xend/server/SrvBase.py index 5990733d75..b32d102273 100644 --- a/tools/python/xen/xend/server/SrvBase.py +++ b/tools/python/xen/xend/server/SrvBase.py @@ -106,8 +106,7 @@ class SrvBase(resource.Resource): try: val = op_method(op, req) except Exception, err: - self._perform_err(err, op, req) - return '' + return self._perform_err(err, op, req) if isinstance(val, defer.Deferred): val.addCallback(self._perform_cb, op, req, dfr=1) diff --git a/tools/python/xen/xend/server/SrvConsole.py b/tools/python/xen/xend/server/SrvConsole.py index 4105fa6e16..c8878ca419 100644 --- a/tools/python/xen/xend/server/SrvConsole.py +++ b/tools/python/xen/xend/server/SrvConsole.py @@ -36,7 +36,7 @@ class SrvConsole(SrvDir): req.write('') return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "console", req) def form(self, req): req.write('
' % req.prePathURL()) diff --git a/tools/python/xen/xend/server/SrvConsoleDir.py b/tools/python/xen/xend/server/SrvConsoleDir.py index 139f302536..140713c57d 100644 --- a/tools/python/xen/xend/server/SrvConsoleDir.py +++ b/tools/python/xen/xend/server/SrvConsoleDir.py @@ -44,7 +44,7 @@ class SrvConsoleDir(SrvDir): req.write("") return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "ls_console", req) def ls_console(self, req, use_sxp=0): url = req.prePathURL() diff --git a/tools/python/xen/xend/server/SrvDir.py b/tools/python/xen/xend/server/SrvDir.py index 712521c7b3..6b36b1e4b6 100644 --- a/tools/python/xen/xend/server/SrvDir.py +++ b/tools/python/xen/xend/server/SrvDir.py @@ -88,7 +88,7 @@ class SrvDir(SrvBase): req.write('') return '' except Exception, ex: - self._perform_err(ex, "GET", req) + self._perform_err(ex, "ls", req) def ls(self, req, use_sxp=0): url = req.prePathURL() diff --git a/tools/python/xen/xend/server/SrvDmesg.py b/tools/python/xen/xend/server/SrvDmesg.py index 11fa4547c2..f383b07d3b 100644 --- a/tools/python/xen/xend/server/SrvDmesg.py +++ b/tools/python/xen/xend/server/SrvDmesg.py @@ -31,7 +31,7 @@ class SrvDmesg(SrvDir): req.write('') return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "dmesg", req) def info(self): return self.xd.info() diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py index 2fc8ee4877..912b1af674 100644 --- a/tools/python/xen/xend/server/SrvDomainDir.py +++ b/tools/python/xen/xend/server/SrvDomainDir.py @@ -133,7 +133,7 @@ class SrvDomainDir(SrvDir): req.write("") return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "ls_domain", req) def ls_domain(self, req, use_sxp=0): url = req.prePathURL() diff --git a/tools/python/xen/xend/server/SrvNode.py b/tools/python/xen/xend/server/SrvNode.py index c1b3ab560e..7776bbf846 100644 --- a/tools/python/xen/xend/server/SrvNode.py +++ b/tools/python/xen/xend/server/SrvNode.py @@ -60,7 +60,7 @@ class SrvNode(SrvDir): req.write('') return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "node info", req) def info(self): return self.xn.info() diff --git a/tools/python/xen/xend/server/SrvVnetDir.py b/tools/python/xen/xend/server/SrvVnetDir.py index 3577cb631f..dc95c18c57 100644 --- a/tools/python/xen/xend/server/SrvVnetDir.py +++ b/tools/python/xen/xend/server/SrvVnetDir.py @@ -88,7 +88,7 @@ class SrvVnetDir(SrvDir): req.write("") return '' except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "ls_vnet", req) def ls_vnet(self, req, use_sxp=0): url = req.prePathURL() diff --git a/tools/python/xen/xend/server/SrvXendLog.py b/tools/python/xen/xend/server/SrvXendLog.py index 0edb110572..ad4c0c572b 100644 --- a/tools/python/xen/xend/server/SrvXendLog.py +++ b/tools/python/xen/xend/server/SrvXendLog.py @@ -21,4 +21,4 @@ class SrvXendLog(SrvDir): try: return self.logfile.render(req) except Exception, ex: - self._perform_err(ex, req) + self._perform_err(ex, "log", req) -- 2.30.2